From 848ce39f7a13821af0833b36d5bb9aa3a866a1cd Mon Sep 17 00:00:00 2001 From: Thomas Fitzsimmons Date: Fri, 26 Aug 2005 03:48:27 +0000 Subject: [PATCH] Acquire GDK lock. (#314533, Thomas Fitzsimmons) 2005-08-25 Thomas Fitzsimmons * gtk/gtkfilesystemmodel.c (idle_finished_loading_cb): Acquire GDK lock. (#314533, Thomas Fitzsimmons) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ gtk/gtkfilesystemmodel.c | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/ChangeLog b/ChangeLog index e68d25f1c4..ab515b11c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-08-25 Thomas Fitzsimmons + + * gtk/gtkfilesystemmodel.c (idle_finished_loading_cb): Acquire GDK + lock. (#314533, Thomas Fitzsimmons) + 2005-08-25 Matthias Clasen * gtk/gtktoolbar.c (_gtk_toolbar_elide_underscores): Handle diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e68d25f1c4..ab515b11c6 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2005-08-25 Thomas Fitzsimmons + + * gtk/gtkfilesystemmodel.c (idle_finished_loading_cb): Acquire GDK + lock. (#314533, Thomas Fitzsimmons) + 2005-08-25 Matthias Clasen * gtk/gtktoolbar.c (_gtk_toolbar_elide_underscores): Handle diff --git a/gtk/gtkfilesystemmodel.c b/gtk/gtkfilesystemmodel.c index b841b95fd0..54676bd240 100644 --- a/gtk/gtkfilesystemmodel.c +++ b/gtk/gtkfilesystemmodel.c @@ -685,11 +685,15 @@ root_folder_finished_loading_cb (GtkFileFolder *folder, static gboolean idle_finished_loading_cb (GtkFileSystemModel *model) { + GDK_THREADS_ENTER (); + g_signal_emit (model, file_system_model_signals[FINISHED_LOADING], 0); g_source_destroy (model->idle_finished_loading_source); model->idle_finished_loading_source = NULL; + GDK_THREADS_LEAVE (); + return FALSE; } -- 2.30.2